Skip to content

Fixes #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 29, 2021
Merged

Fixes #638

merged 2 commits into from
Oct 29, 2021

Conversation

metacosm
Copy link
Collaborator

@metacosm
fix: replace jandex plugin by Quarkus detection of beans.xml files
f001644 
This allows to not run into compatibility between index versions.
@metacosm metacosm self-assigned this Oct 28, 2021
@snowdrop-bot snowdrop-bot mentioned this pull request Oct 28, 2021
Closed
csviri
csviri reviewed Oct 29, 2021
View reviewed changes
operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ControllerManagerTest.java Outdated

public class ControllerManagerTest {

@Test(expected = OperatorException.class)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we using junit4 here?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.baeldung.com/junit-assertions#junit5-assertThrows

csviri
csviri reviewed Oct 29, 2021
View reviewed changes
operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ControllerManagerTest.java Outdated
config(TestCustomResource.class), null));
}

@Test(expected = OperatorException.class)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, this should be different in Junit5,

csviri
csviri approved these changes Oct 29, 2021
View reviewed changes
Copy link
Collaborator

@csviri csviri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JUnit5 should be used, ootherwise LGTM

@metacosm
fix: improve duplicated controller detection, add tests
92c388b 
While we originally planned to make it possible to register controllers
with the same CR but with different version (see #637), that behavior
should actually be forbidden since only one CR version can be served,
see #94 for more details.
@metacosm metacosm merged commit 0287c0c into master Oct 29, 2021
@metacosm metacosm deleted the fixes branch October 29, 2021 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@csviri csviri csviri approved these changes

Assignees

@metacosm metacosm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

It should be possible to add controllers for different versions of the same CustomResource
2 participants
@metacosm @csviri